Auto merge of #1341 - alexcrichton:issue-1333, r=huonw
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:17:22 +0000 (00:17 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:17:22 +0000 (00:17 +0000)
commit8738c61545f10d1f21aeb1fe33f9412339a13ed7
tree803e54ace8827af582f8012e0ad4a7ef796315bb
parent5bb4d8dc11bac983596ee8cae877afc289f245a2
parent777eadb1151631b34197cf186598d7a60a04e7db
Auto merge of #1341 - alexcrichton:issue-1333, r=huonw

Closes #1333